Cleanup
Remove unused util functions