Remove unnecessary invocations