initial commit - step 1 cleanup