Remove dependency on vulcan