Fix for removing batch notes