simplify registration module #281

simplify registration module #281