cleaning up, deleted the funcs, as they're in gbs_mod