Removing prefix-tree requirement, and removing animation callbacks