Removed several checks and configured a few checks.