Clean up a couple of views