unnecessary code eliminated @vjovanov