Remove all old unused code