reduce duplication / remove un-used