some cleanup after CaozInstall woes