Now trying to clean the sources