A little cleanup

Left some older code commented in case I wanted to revert.