cleanup proto and static methods