Remove dependency on Transit Module