removing calls to 'new'