cleaned up java remains