Removed other unneeded stuff