Remove dependency on Reservoir and AndroidAnimation