Clean up code related to old overlay object system