deleted some unused locals