More status cleanup