Removing rate, client improvements