Removed/commented out dead code