Remove some dead boilerplate code