Fixed small break in last merge

Fixed an alphabetization that broke in the merge. Also deleted out of date commented out code.