Remove cluttered content and move troubleshooting