Remove unused variables from sinfig-studio code again