Remove LongSpareArray + some cleanups

Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
7 files changed