Remove old unused code