remove hardcoded requests in swap