Clean-up of some old unused functionality