#558 - Remove classes not used