move to 2.11
optimize
clean up