Took out some bells and whistles