Removes unnecessary castings and wrappers

List were filled with wrapped EstabReference (POJO) objects which were casted back to ElementModel