Don't drop tables yet
Cleanup