Removed buggy focus code