Removing some old boilerplate code