Fix previous view cleanup