more view cleanup