Merge "GUI: Remove unused variables"