Remove commented out sections

Expose minimal changes to r12.cpp