Bugfix, clean the code and pass to babylon 1.11