cleaning up the Code War branch