D2k cleanup

Let's see if this triggers a proper Travis build.