lots of cleanup for winbind.  Thank you vagrant!