Remove unneeded components