cleanup, database additions