Remove Order Bug Fix