remapping stuff, removing unneeded stuff