Removed references to encoder