Limit mulit-instance requests where we already know it's not supported by a class.
Code tidy
Remove unused imports