Code refactoring

Check limit moved to AppCtr