Remove/change some unnecessary calls.