Revert "Revert "remove unused views""

This reverts commit 9febd6ca6df0e359c3e423d3f62afd03c52e2b2f.