Removing some expensive and unnecessary calls.