Cleanup previous commits to extract only translation related features.

Signed-off-by: Bart Jaskulski <bjaskulski@protonmail.com>