Removed copyright headers
Removing unused method
Converting entities to field access
Making test pass