removing more static references that are no longer necessary