cleanup and version bump to fix travis.ci build issue, cleanup Fixes #3