add better view cleanup