Soem mor skeleton templates and basic registration classes cleanups