Remove unnecessary util functions