removed unused code, + animations