Clean.
gcc-4.8.1 + warning fixes
Revert a useless change
Remove some warnings.