Code cleanups
Crude debug attempts for Travis test case fails