Some cleaning-up