Added safety cleans of registers, removed commented out code.