Remove some acis that no longer matter.

Change-Id: I61791176eaf9c1ecd875cec42526645b2b507b82
Merge "Remove some acis that no longer matter." into production