General cleanup of unused variable warnings