Removed some unused private functions