@justinmk Can't we rely on git here? All the code this PR deletes is unused at the moment. We can restore this using git, when we need it.