Remove unneeded stuff