lots of view cleanup