remove demo link and route
users templates working
resolves merge conflicts