Cleanup and first CNN tests