Some cleaning ...