Took out some weird junk code