Remove unused configs

Change-Id: I469a4488a78a026388d987a16a9c1959cb6d2a04