cleaned up GIT mess