Remove some boilerplate