Clean junk and minor translations