md5 and small clean up