Removed unused registry and several other updates