patch to remove DB refferences