Fix: remove unused files part 2