Added removeComponent