Removing module registry code