Clean out old unused code and functions