pyramid: Cleanup

Change-Id: Id68c64bfbcfc92308bff37c5a852de13fa879110
Merge "pyramid: Cleanup" into jellybean