this should be cleaned up, which will make Travis happy too