Removed expensive and unnecessary calls