Removed redundant function + file