cleanup configuration

Change-Id: I99e547b81941da40fa298209f91c87c041a1f8ca