Remove unused files and some more fixes by Carreau