Remove extract function