cleared redundant code