[#3] Removed redundant code (continued)