v29 code cleanup