Remove now not used components