Remove unnecessary private functions