Add configuration for v1.4 branch, remove dead code