redundant code removed