Remove AP and PUTS from the template