Removes data retrieval from the views. Fixes #677.
Merge pull request #687 from afred/clean-up-lookups

Removes data retrieval from the views. Fixes #677.