minor clean up for future code