pyramid: cleanup and updates