Remove useless code

Change-Id: I9103455b2b82269798f7b865b800c7f427c98178
Merge "Remove useless code" into du44