Clean: removed commented out code.
Fix: merge conflict.