Remove use of registry for now