Removed as many references to me as possible