Removed extra parts