Translations: Improved and removed unused parts [Closed #45]