:tongue: some knockout cleanup