Disable notes instead of removing them.
Unit issues fixed.