Removed more unneeded stuff