Equipment class cleanup