first round of rb532 cleanup