Remove deprecated classes