cleanup
fix build failures on Travis