Removes unused code and trying to fix travis