Before I review this further - it it's already deprecated, why not remove it now?