Fix additional compiler warnings
Cleanup (unused variables)