Duplicated conf file removed.

Change-Id: Id764de6da92ffc7cc37329011098cd408cafaf71