Cleanup compiler warnings for unused variables