delete dead code
rework of main features