Removing unused method
Converting entities to field access