Remove unused components after merge