Removed redundant code (cont.)