Remove some dead code

Please review if that makes sense.