cleaning up views and forms