Clean up imports
Call the right function in scalars
Move out of core
Revert back because of erroneous import naming
Simpler implementation