Cleanup old unused code.