cs: Cleanup from last series of local work; commiting to remote repo