Removed references to internal stuff