Remove unnecessary exported vars and fields