Commented out some old unused code