Cleanup:
- Old code comments removed
- Debug comments removed
- Old log entries for debug removed

Overall summary of changes:
- No changes were made