Remove require to AP stuff that left
Template test were moved to AV