Removed Extrenuous TODO comment, and a now annoying toast.