Removed unwanted components