Remove registry class, again, and enable code analysis