Clean up old code

[Jnchi]

This is not necessary, as the older version can be found in the git history.