If this isn't currently used it should be extracted and added to a general TODO list issue