Remove unused variable
Cleanup unnecesary void pointers