Removed unused scope variables