Unnecessary calls was removed.