Added more todo next, remove logs