Replace overshadowed variables and remove overridden method

Replace overshadowed variables and remove overridden method