Alex ter Weele Cleanup.

Latest commit 1b0530a

Nov 30, 2017