Code cleaning from not used / commented code