Cleanup singleton mess (DB)