Clean up translation fn hierarchy