Removed unused files and cleaned code on Planner&Matchmaker