Removed the possibility of disabling some primary checks