Delete remaining old code

[timrozum]

Just delete some old code that I left for later in order to keep previous PRs smaller.