Remove redundant code
Update with almost all 2014 tests
Update with 2014 indicators