Removing old boilerplate code