Remove old references and make animation faster