add e975 and cleanup

Change-Id: I383db85b8b8c0b56681b508495e81ec103294f5b