* rmed redundant code