updated the clean up... still not complete