Removed shitloads of unnecessary code