Remove superfluous utility functions