Removed 2 TODO-comments