remove comment and logs. (make it works)