Dropped old compatibility code
Lock to 2.2 and fix Travis build