Some cleaning on 06_rebuild