fix ace_manifest and cleanup

Change-Id: Ib8fbaaa436fb0f9f4901b6f7c548f58fcb925e23