Got rid of the startup stuff