Commented out remaining unused code