Drop remaining DB rules

This PR completes #2006.