Make some cleaning and remove obsolete files after the refactoring.