Entity registration cleanup