cleaned up the mapper files and moved the rate-limiting to the client