Cleans up Status model
More cleanup