Removed encoding package from master