more cleanup on view