Would it be better to remove the rest of it in this PR or separate PR? It would require changing code way out of scope of this PR