cleanup + md5 instead of b64