Removed legacy targeting, new targeting macro system is implemented