Delete no longer used lines

And I think there are some others...