More code cleanup and hopefully a travis fix.