Removing troubleshooting statements