Clean up the views more.