removed similar code