[refactor] removed generic from remaining Target classes