removed replaceKeyword

Change-Id: I571c793a183d83979ebb5de9d06bad0cd0768bf3