Remove some dead code

This pull request removes some seemingly dead code (correct me if I'm wrong). It's non-critical but was driving me crazy :)