Remove unecessary random string computation