removed some unused components