Testing refactor

* Remove unecessary lines
same here