clean up
begin work on new registry