Depending on the outcome of the comments above, those may be no longer needed