Remove special code to emit notes