First cleaning - non functionnal / some stupid code