More cleaning
First cut at #28
Merge