GIVEY-561 #comment Remove duplicate
GIVEY-474 #resolve Remove redundant meddling code