Cleaned up troubleshooting