// Removed redundant function calls