removed calling by target selector, simplifications