remove final variables and rely on instance fields instead