Removed TODO that won't be done soon