directive clean up, conforming guidelines