Some cleanup and missed commented lines that didn't cause an error, but were meant to be comments