Took out temporary crap