Removed commented code.
Merge conflict.