Remove old profile code, add search links to subs