Removed redundant code pieces.