Remove duplicate fn from core