reduce duplication
remove un-used code