- some cleaning due ti implementation in definitive project