Cleanning shit
Merging the cleaning stuff ...