Remove unused util code to enhance line & function coverage