removed 8 and 10

Change-Id: If10ade7e0bb8cca05f75f64509d1211e0bea3c10