3.1.4

Clean-up views