Remove packages

Change-Id: I09d3c8df767bac3ba9bd1b3b7b0b4acb409406b8