XD-1616 Code review polishing - remove unused files