Unify DB queuing
Cleanup dependencies