Removed commented out code and avoid one indirection when processing targets.
Deprecated a method.