Remove DB dependencies that aren't actually needed