Removed more uneeded stuff.