Removing references to internal stuff