Refactoring

* Small optimize code
* Remove unwanted files