Removed debug line
Updated TODO
Nothing changed?