Conservative registration for yale storage

Also removed some unnecessary registrations.