cleanup l900 tree

Change-Id: I06eccd709a8253624f1cb4054e1b4d66ee90533b