Some cleaning..