Clean up solution to DDK