Added changes to remove management calls that don't exist anymore.