Fix Simba GUI. Cleanup unused units/vars.