more void* removal
more void* removal