Removed TODO notes