Remove some warnings.
Revert a useless change