orange.java cleanup