Tmp commit
Remove unuseless code