Cleanup - move initialization stuff to utils.initialize()