Cleanup
Work on status refactor [ci skip]