implemented some title cleaning

Change-Id: I540dc5f94f73f6650e706615d444ee3b1fa0ca97