Remove Unneeded Components