Equipment.java cleanup