Removed redundant function calls