Add movable_objects.
Tidy up unused bytes.