Some cleaning
Merge with develop