Removed TODO Comment