Removed focus hackery