Removed some unneeded stuff.