artf628844: Removing unused files and code refactoring in Framework