Removed resolved TODO