Cleanup some remaining minor issues.
Closed: duplicate
2.0
Code
Closing this to make a new fork with palantir2.
georob → closed merge request !103