This commit is totally broken and removes a lot of still used strings. Please TEST commits before removing stuff!!!! This reverts commit c1ea4676. Change-Id: I065c17385ced86857c938e4102b9473d622ac59d
