fixing build, removing obsolete calls