Removed several checks and configured a few checks.
Final for CS2340