Removed unused crap