Touch + Mouse code + test cleanup