Deleted Smoldino's TODO