code cleanup step 0