Revert "started refactoring targeting"

This reverts commit 28e9cd08f95cb167e4e9d1c0a5c4f857d47561a2.