Further remove unicode() references from models