Remove unused comments
Remove AFUP core routing
Update dependencies