JCSP User add cleanup