style changes
remove Origin

This greatly simplifies the architecture.