Removed heaps of crap