extra cleaning on CodeSolar & adaptation of BioMain