Remove unnecessary public definitions