Removed unused variables
Removed outdated TODO
Removed unneeded SYSTem handler stubs
Changed global zero cal constant to only be available during debug
Replaced code commenting with DEBUG define checks