Code cleaning of SCC
Fixing some DRUP issues
Cleaner code
More DRUP debug