refactored code for crits
remove deprecated versions