1) Some cleaning