removed some boilerplate stuff