Startup class cleanup