Final cleanup of objects (for now?)