Remove final variables