Remove redundant code from buildstep