fix SKIP directives
a bit more cleaning