Remove obsolete require
Add more TODOs