Removed unneeded stuff