animation separation and framework cleanout