nota-778 clean up