* removed redundant code