cleaning, applied already to devel and qa