Clean up after initial port.  Still need to handle mechanism to
select a database that isn't in the top databases list.