Cleaned up database

Cleaned up the database by merging several redundant items and removing
the location objects.