Some cleanup to help those which clone the repository