cleaned up attach/detach AWS API