Remove the singletap

It double-triggers the class