Moved functions to utils. Remove ambiguity commented out