Removed some unecessary usings and one assembly reference