some cleanup -> fix the broken build