Removed TODO lines