Remove caTools dependency