Merge to develop, remove a bit of cruft.

Merge it baby!