Removed a lot of startup code that actually made things worse