Fix the build
Remove not needed files
Fix coding style