removed duplicate functions from core