[Emulink] code cleanup