[wip] does more view cleanup