Removed some more unneeded stuff