Refactor

* Removed junk!!!