Remove dependency on deprecated module