Removed some unecessary usings and one assembly reference
Merge commit 'a98853c47975f472675e486a44acffd0f9823240'