CS issues and comment out hardcoded checks.