cleanup + barrier (WIP)