further clean up and another try to make travis and testling work