Removed more references to internal stuff