cleanup overlay. This goes in common