Cleanup links and activeUser handling