Remove commented out configuration

Change-Id: I4024218d83bda11cd7c3c7b9e5e6203c943820fa