Remove unneccessary components