cleanup old view and close #6