[#3] Removed redundant code