Remove and consolidate commented code.