Last missing $public removal, See #13