Remove log statements and outdated to-do warnings