Removing unneeded components