General fixes, localization, legacy code removal