more cleanup of views