diff --git a/.travis.yml b/.travis.yml
index 1af73978977427526eae33a641dfa27ad0589468..10ed0557f77384d5dc8a6b423f0f81fe89fb0cee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,14 @@
 sudo: false
-
 language: php
-
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
-
 matrix:
   allow_failures:
     - php: hhvm
-    - php: 7.0
-
 before_script:
   - composer install --no-interaction
-
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.clover
-  - vendor/bin/phpcs -p --standard=vendor/ongr/ongr-strict-standard/Ongr --ignore=vendor/ ./
+  - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/ ./
diff --git a/composer.json b/composer.json
index 3004317b2af536231628d12d4f74ef87a2e2d400..e24c80c4a3ab234e0b8776a9ef8bbe2fd9e77a0c 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~4.4",
-        "squizlabs/php_codesniffer": "~2.0",
-        "ongr/ongr-strict-standard": "~2.0"
+        "squizlabs/php_codesniffer": "~2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/docs/Aggregation/TopHits.md b/docs/Aggregation/TopHits.md
index f70995be58711964ae1b7aa3841626f962e686f1..e9e040ca4f2164136de10bf9bf23aedbfe45fa4d 100644
--- a/docs/Aggregation/TopHits.md
+++ b/docs/Aggregation/TopHits.md
@@ -43,7 +43,7 @@ so that the top matching documents can be aggregated per bucket.
 And now the query via DSL:
 
 ```php
-$sort = new Sort('last_activity_date', Sort::ORDER_DESC);
+$sort = new FieldSort('last_activity_date', FieldSort::DESC);
 $sorts = new Sorts();
 $sorts->addSort($sort);
 $topHitsAggregation = new TopHitsAggregation('top_tag_hits', 1, null, $sorts);
diff --git a/src/SearchEndpoint/SortEndpoint.php b/src/SearchEndpoint/SortEndpoint.php
index d19249d7698023a4e5487d1c6971c53f2c328e9b..2461c85871717e3b12f22fb022a561131b2a611b 100644
--- a/src/SearchEndpoint/SortEndpoint.php
+++ b/src/SearchEndpoint/SortEndpoint.php
@@ -11,9 +11,6 @@
 
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchDSL\BuilderInterface;
-use ONGR\ElasticsearchDSL\Sort\AbstractSort;
-use ONGR\ElasticsearchDSL\Sort\Sorts;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**