Kdyby\Translation now used in translatable, cleanup + simplified