Removing more "internal use" variables