Remove entitymanagerawaretrait as it's extending abstractservicelocatoraware