Remove registry calls