Removed TODO note