Cleaning features & testing