removed accidentally duplicated code