Removed some crappy code