BPW does clean-up tasks

BPW does clean-up tasks