Removed redundant locals