cleanup and touch support