Remove old views
Fix PR comments