Testing refactor

* Remove unecessary lines