manual 'reset' to make sure only relevant changes go into pull request
removing changes that don't belong in pull request
cleanup