Remove useless function
Add return statement
Modify breadcrumbs