working on cleaning procedure