Remove workaround notes due to fix