Remove old code

...and another one...