Clean up
Had to fix polluted database tables