Removed my TODO