ticket2: some cleanup