Removed extra components