travis fix and guard removed