WIP on supporting page cleanup