Removed unnecessary focus request
Removed obsolete variable