Clean up code.
Merge branch 'de-wip'