utils cleanups - add relation to db