initial deletions for rewriting views
rewrote views and template context builders to reflect the new model changes