Clean up some javaducks