Some cleanup to the components