Remove log
Refactor