Clean code

+ Removed instrument special-casing
+ Removed ViewchainFactory