Remove debug code
Increase max cyclomatic complexity to 18