remove redundant condition.
Fix renamed methods in dsl ref.