Cleaned some startup code