removed redundant animate mixin & tidied up references