cleaning code
Merge remote-tracking branch 'origin/wip_adm' into wip_adm