Cleanup old unused code