Removed redundant calls