Remove obsolete TODO comments
Remove assertions