re-16 clean up