Some cleanup to make files smaller.