Removing DB dependencies