Tidy of container registrations