Clean up
Don't submit sort and direction twice