Removing DB refernces