Rewrite 417

Remove outdated/old code.