Removed some unneeded stuff