Should we remove this code, or is/will it be useful in the future?