add status cleanup for views