Removed references to encoding/encoder