remove old focus fix