Removed Mode class