removed is_a? calls