cleanup common tree

Change-Id: I2634b669bf8ed8118496c0b2519c6c60dbadd01d