adding focus cleanup