Remove Unneeded stuff