Remove more target specific behavior (refs #206)