More deck cleanup