Merge clean into developement

Update development branch based on cleaning