more cleanup on the views