Do some clean-up in the Java code. Nothing important