Remove commented lines, change name of nonexistent variable