Clean up path and Java