Caching views
Remove unused code