...
 - Removed some unused References
 - Simplified the Code