SW-42. Clean up commented code.