Integrate db cleaner

The home grown version was not working well in another project