Code Cleanup
* Removed unused references