more md5 cleanups