Remove unnecessary dependency on Dynamic API
Remove dependency on old API
Convert AttributeFilter to ElementFilter