Get rid of startup functions