XD-576-2 Code Review - remove super() from Target