Remove TODO + rename checkEnforce to _checkEnforce