Cleanup, make one function conditional.