cleanup a few things, restore javaducks