remove recurrence code from core