D2k cleanup

Let's see if this triggers the Travis bot.