Client is cleaner now