Some status stuff - cleanup before branch