Preparation for pull request, minimize change set