removing redundant focus code