removed some of the stupid