redundant code fix