Clean up with todo