remove race condition upon vm cloning, general cleanup