Updated Stuff

Deleted a bunch of unsued stuff, leting IC2 and MC do the work for me :D