build fixed (need to be improoved)
to deploy
removed useless code