Really removing unneeded stuff this time