Remove deprecated definitions