removed debug logging and fixed buildstep cleanup