Cleanup + removal of XLF translation format (not supported anyway). Cleanup of unused variables.
Re-added translations for flat projects - fixed testcase