buildstep as a submodule
lots of cleanup