click to tap + cleanup