Code cleaning

Removing declarations of variables that hides definition from superclass