Clean up. ETB TPS.#362

mikaelhirn wants to merge 4 commits intoFOME-Tech:masterFOME-Tech/wiki:masterfrom

mikaelhirn:cleanUpEtbTpsmikaelhirn/fome-wiki:cleanUpEtbTpsCopy head branch name to clipboard