minor bugfixes after changes in builder away from cmake:

• wrong use of self in deprecation message
• removal of generated files was not correctly adapted

added 15 commits

• 2fff5942...14766f4f - 14 commits from branch master
• 20df19f0 - minor bugfixes after changes in builder away from cmake:

Compare with previous version

merged

mentioned in commit db065741