Better logs and clean unused method