22/6 bug fix + clean manifest + delete NihtaftiActivity + 1 fix