Remove interface & Duplication code