cleanup some warnings and add --skip-cleanup