more cleanup and troubleshooting