remove @public annotations, they aren't used consistently