Content Views: Removing more old models

Content Views: Removing more old content view definition models. Also, got
tests to pass.