cleanup after location merge 2

- added a comment to styles for Chris to make style refactoring a bit
easier
- added dbadapter class that got dropped during merge