First iteration of new API.
Remove unused functions from utils.