Removed references to old implementation that treated it as current
Merged in changes