Reorganise top vars. Remove unused vars.