Removed attractionsdb

- plus other refactoring and fixes