Separate animation and shapes
Rename util.dummy to util.noop