Clear out some unused code