remove unneeded code
fix updating of location or duration to propagate correctly to instances