Remove old namespace, add reponse usage