APF-1231: minor clean up