Remove commented out configuration

Change-Id: I57dafbffb54621adc293206f03b14148a48186bf