attempt to cleanup and make dist-safe