Java cleanup