Improve API. Remove some logs