Code and translation cleanup.