Removed unessecary entity copy