[fix] logs, hardcoded values and todo deleted