Clean up attributes so they don't error out when no cloud account is found