[UPDATE] Removed redundant calls