pyramid: cleanup

Change-Id: I63448002c6df98f5e619a60c47c68bd05e431b7b