Cleaning sources for the next release