Fix require
Remove outdated TODO