start removal of NoteFixer code