Did some cleanup of package file and travis build
Cleaned up prototype code