removing some boilerplate junk