Remove a few redundant calls