Some cleanup to adapt to the new website