cleanup after Bottles 2.0