Cleaning

I found some code to be removed by fixing warnings.