removing unnecessary public and public until fields - #15661506405832