Disinfection should include