Put together database modules.
Delete an obsolete script.
Remove redundant import lines.