Cleaning up Java repo