Remove void* cast from pointers - unnecessary and causes breakage with __eds__ pointers
Merge branch 'feature/no-voidstar' into next