Duh: removed obsolete locals