wip + remove dead code + cleaning