clear out configs kept in common

Change-Id: I2ae6fc3040516339f20cdfded8f94409281d97b0