Some housekeeping with unnecessary variables in the feature