Getting rid of a bit of dead code (for now)