Removed TODO-Comments