Cleanup views - remove obsolete views and update views to new structure.