more cleanup (should fix compile on "default" buildslave)