Note type clean-up