[WFLY-456] i18n and get rid of cleaned up code