Feat/remove dupulicated