Extra packages cleanup

Change-Id: If00a8d82a3bf5217c2153635387e81f46af6da88