spark: update to 1.1.1, simplify a lot