! Remove old code (fixes #1621)