removed some crappy things