* Stat fixed
* cleanup