Clean up secondary notes some more