Note just to clean up commented out code.