Remove dead-code (following 032951cca7270daca9bcc8f5b99e80ba111db02a)