Cleanup java classes