Remove unused configs

Change-Id: I8de1fdf2ffd70bede3622ca8cc708845cfbf4890