Removed encoding in preparation for new library