removed some components not really needed