Can we not do this, and instead remove code?