Clean up??

Probably can delee need_merning, prelinaro,

Change-Id: I2a0c3575508f5da0f900c6f72c1fb38a2212408f