Clean up cruft from old C# implementation