Testing refactor

* Remove unecessary lines
and here