Some cleaning and testing