More administrative clean up of Commented-Out Code