Remove some boilerplate code