Clean up a lot more of the $dbh entries