Remove unused packages

Change-Id: Ide61ffc9d1a0476246ff939bf4ddef061b290ae6