Value conversion cleanup - touch will be broken