Clean up imports
Nice database check