Removed redundant function