Removed some useless crap