Added TODO to get rid of globals

Also deleted unused stuff from test data (board images drawn by C++
version of AH)