Clean-up create to not fail if no disk configuration is provided
Clean-up delete to ensure we have a valid id and server object