Removed unused components