merge challenge page cleanup