Since not used anyhow, and your above solution is definitely _nicer_, please remove these obsolete functions.