cleanup of some unnecessary calls