Removed extra checks