Cleanup of unused variables, make it compile cleaner :)