Minor cleanup of db code. Modify requirements.
Massive cleanup of creator + unittests.