removed GODDAMN redundant code