Removed some crap and modified some other crap