cleaning up after Bottles 2.0