cleanup common config

Change-Id: I0ae9b7e0a9ec1af0c069b69ba21eb00c3995127c
Signed-off-by: scott <scott@ubuntu>