Removed TODO-comments