removed some components