remove un-needed autofocus directive
simpilfy code